Auto merge of #1492 - alexcrichton:issue-1491, r=huonw
authorbors <bors@rust-lang.org>
Wed, 8 Apr 2015 00:29:10 +0000 (00:29 +0000)
committerbors <bors@rust-lang.org>
Wed, 8 Apr 2015 00:29:10 +0000 (00:29 +0000)
commit33b6aa7c04044fb3082d95bb293c1701f1dee155
tree6d51349ed066aba76caea0be95385d2f8b9c90a3
parentc3259e09a0fe9aba8c9036befbe6b92386f06c91
parentfc5abf10bfdbd30a80cf6f640d3ad9959eb2871c
Auto merge of #1492 - alexcrichton:issue-1491, r=huonw

Closes #1491